From: Jyrki Gadinger <nilsding@nilsding.org>
Date: Fri, 24 Jan 2025 09:50:51 +0000 (+0100)
Subject: fix "Resolve conflicts" dialog not showing up
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~2^2~110^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e921e969a5da688276f68a6b237cc42abe667441;p=nextcloud-desktop.git

fix "Resolve conflicts" dialog not showing up

commit 00b616ba9d92a492b0c4e5101b58fff6506591ef removed the call to
`QScopedPointer::take` as it's considered deprecated in Qt 6.1 and
advises to use `std::unique_ptr` with `release()` instead

--> replace `QScopedPointer` with `std::unique_ptr` and call its
`release()` method as part of the cast to `QQuickWindow*`

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
---

diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
index 3c28aca04..8e45abe66 100644
--- a/src/gui/systray.cpp
+++ b/src/gui/systray.cpp
@@ -301,13 +301,13 @@ void Systray::createResolveConflictsDialog(const OCC::ActivityList &allConflicts
 
     // This call dialog gets deallocated on close conditions
     // by a call from the QML side to the destroyDialog slot
-    auto dialog = QScopedPointer(conflictsDialog->createWithInitialProperties(initialProperties));
+    auto dialog = std::unique_ptr<QObject>(conflictsDialog->createWithInitialProperties(initialProperties));
     if (!dialog) {
         return;
     }
     dialog->setParent(QGuiApplication::instance());
 
-    auto dialogWindow = qobject_cast<QQuickWindow*>(dialog.data());
+    auto dialogWindow = qobject_cast<QQuickWindow*>(dialog.release());
     if (!dialogWindow) {
         return;
     }